From 116853db94f841c81565ecd8cd94302143e3dda8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 11 Dec 2000 15:04:36 +0000 Subject: [PATCH] Fix up finalizer to chain to its parent. Mon Dec 11 10:02:26 2000 Owen Taylor * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): Fix up finalizer to chain to its parent. --- ChangeLog | 9 ++++++++- ChangeLog.pre-2-0 | 9 ++++++++- ChangeLog.pre-2-10 | 9 ++++++++- ChangeLog.pre-2-2 | 9 ++++++++- ChangeLog.pre-2-4 | 9 ++++++++- ChangeLog.pre-2-6 | 9 ++++++++- ChangeLog.pre-2-8 | 9 ++++++++- gtk/gtkimcontextsimple.c | 10 +++++++++- 8 files changed, 65 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ce78b35cb4..de0a0e64d9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Dec 11 10:02:26 2000 Owen Taylor + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): + Fix up finalizer to chain to its parent. + 2000-12-11 Alexander Larsson * docs/README.linux-fb (GDK_KEYBOARD_TYPE): @@ -115,8 +120,10 @@ function, noticed by Alex 2000-12-06 Elliot Lee + * configure.in: Detect freetype properly - * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above. + * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of + above. 2000-12-06 Alexander Larsson diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 78c254728a..4b346dc9c3 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -802,7 +802,15 @@ gtk_im_context_simple_finalize (GObject *obj) { GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (obj); - g_slist_free (context_simple->tables); + if (context_simple->tables) + { + g_slist_foreach (context_simple->tables, (GFunc)g_free, NULL); + g_slist_free (context_simple->tables); + + context_simple->tables = NULL; + } + + parent_class->finalize (obj); } GtkIMContext * -- 2.30.2